]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
gnome-shell: fix restart after rebuild
authorDan Winship <danw@gnome.org>
Mon, 21 Mar 2011 12:47:36 +0000 (08:47 -0400)
committerDan Winship <danw@gnome.org>
Mon, 21 Mar 2011 13:20:23 +0000 (09:20 -0400)
Alt+F2 restart was failing after a rebuild when running from the
source tree because it would try to restart
".libs/lt-gnome-shell-real", which didn't exist yet. Fix this by using
"libtool --mode=execute" at build time to regenerate that file.

https://bugzilla.gnome.org/show_bug.cgi?id=645390

src/Makefile.am

index 7fcd3e8d09f1475b802826107b5b854bbf7504b3..fa79fccbef5d23b16b01248df71298debfeeb089 100644 (file)
@@ -44,8 +44,10 @@ generated_script_substitutions = \
            -e "s|@VERSION[@]|$(VERSION)|" \
            -e "s|@sysconfdir[@]|$(sysconfdir)|"
 
-gnome-shell-jhbuild: gnome-shell-jhbuild.in Makefile
+gnome-shell-jhbuild: gnome-shell-jhbuild.in gnome-shell-real Makefile
        $(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@
+       @# Regenerate libtool wrapper so Alt+F2 restart will work
+       @$(LIBTOOL) --mode=execute test -f gnome-shell-real
 
 gnome-shell-extension-tool: gnome-shell-extension-tool.in Makefile
        $(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@